Follow Make 4.0 directory changes in compile mode

Add 0020-Emacs-should-now-follow-Make-4.0-directory-changes.patch
to incorporate the relevant upstream patch.

Thanks to Christophe Troestler <Christophe.Troestler@umons.ac.be> for
reporting the problem.

Closes: 747624

diff --cc debian/.git-dpm
index b565b2fe75d0c215644098adf639364ed828a190,0000000000000000000000000000000000000000..d42a665ae4abe18863a3a4c705645a95af71b141
mode 100644,000000..100644
--- 1/debian/.git-dpm
--- /dev/null
+++ b/debian/.git-dpm
@@@ -1,8 -1,0 +1,8 @@@
- 79b09b9067bac0f0f3076a72cf066b630217c83e
- 79b09b9067bac0f0f3076a72cf066b630217c83e
 +# see git-dpm(1) from git-dpm package
++25165cbbd5aca3a56aa5921d05a361b16a11b591
++25165cbbd5aca3a56aa5921d05a361b16a11b591
 +24c1fe67725d87a843919696fdc1ff49c99e7fd4
 +24c1fe67725d87a843919696fdc1ff49c99e7fd4
 +emacs24_24.3+1.orig.tar.bz2
 +421a2aef37aedf8ca24bb57cd100d173022e79a4
 +25725234

diff --cc debian/patches/0020-Emacs-should-now-follow-Make-4.0-directory-changes.patch
index 0000000000000000000000000000000000000000,0000000000000000000000000000000000000000..6f7ef4f96531f285c381849f49b118f8c6d176aa
new file mode 100644 (file)
--- /dev/null
--- /dev/null
+++ b/debian/patches/0020-Emacs-should-now-follow-Make-4.0-directory-changes.patch
@@@ -1,0 -1,0 +1,60 @@@
++From 25165cbbd5aca3a56aa5921d05a361b16a11b591 Mon Sep 17 00:00:00 2001
++From: Jed Brown <jed@59A2.org>
++Date: Wed, 23 Oct 2013 09:25:56 -0700
++Subject: Emacs should now follow Make 4.0 directory changes.
++
++This upstream patch has been added:
++
++  compile: Support GNU Make-4.0 directory quoting (tiny change)
++
++  * lisp/progmodes/compile.el (compilation-directory-matcher)
++  (compilation-page-delimiter): Support GNU Make-4.0 directory quoting.
++
++Origin: upstream, commit: r114757, 1ecd341c106bec179db172bc5c992ac236e70274
++Bug: http://debbugs.gnu.org/15678
++Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=747624
++Added-by: Rob Browning <rlb@defaultvalue.org>
++---
++ lisp/ChangeLog            | 6 ++++++
++ lisp/progmodes/compile.el | 4 ++--
++ 2 files changed, 8 insertions(+), 2 deletions(-)
++
++diff --git a/lisp/ChangeLog b/lisp/ChangeLog
++index 8a90261..abde30f 100644
++--- a/lisp/ChangeLog
+++++ b/lisp/ChangeLog
++@@ -28,6 +28,12 @@
++      (trace-call-tree): Simplify and update.
++      Avoid predictable temp-file names.  (http://bugs.debian.org/747100)
++ 
+++2013-10-23  Jed Brown  <jed@59A2.org>  (tiny change)
+++
+++     * progmodes/compile.el (compilation-directory-matcher)
+++     (compilation-page-delimiter):
+++     Support GNU Make-4.0 directory quoting.  (Bug#15678)
+++
++ 2013-03-11  Glenn Morris  <rgm@gnu.org>
++ 
++      * Version 24.3 released.
++diff --git a/lisp/progmodes/compile.el b/lisp/progmodes/compile.el
++index 68a83b4..8e0d501 100644
++--- a/lisp/progmodes/compile.el
+++++ b/lisp/progmodes/compile.el
++@@ -514,7 +514,7 @@ listed text properties PROP# are given values VAL# as well."
++   "Directory to restore to when doing `recompile'.")
++ 
++ (defvar compilation-directory-matcher
++-  '("\\(?:Entering\\|Leavin\\(g\\)\\) directory `\\(.+\\)'$" (2 . 1))
+++  '("\\(?:Entering\\|Leavin\\(g\\)\\) directory [`']\\(.+\\)'$" (2 . 1))
++   "A list for tracking when directories are entered or left.
++ If nil, do not track directories, e.g. if all file names are absolute.  The
++ first element is the REGEXP matching these messages.  It can match any number
++@@ -527,7 +527,7 @@ directory we were in before the last entering message.  If you change this,
++ you may also want to change `compilation-page-delimiter'.")
++ 
++ (defvar compilation-page-delimiter
++-  "^\\(?:\f\\|.*\\(?:Entering\\|Leaving\\) directory `.+'\n\\)+"
+++  "^\\(?:\f\\|.*\\(?:Entering\\|Leaving\\) directory [`'].+'\n\\)+"
++   "Value of `page-delimiter' in Compilation mode.")
++ 
++ (defvar compilation-mode-font-lock-keywords

diff --cc debian/patches/series
index 1f600bf3655cc9413d45e6315341f08b4fcd66fc,0000000000000000000000000000000000000000..6c0665115e6c87ec063796743f2bc1a390f56ef1
mode 100644,000000..100644
--- 1/debian/patches/series
--- /dev/null
+++ b/debian/patches/series
@@@ -1,19 -1,0 +1,20 @@@
 +0001-Prefer-usr-share-info-emacs-24-over-usr-share-info.patch
 +0002-Run-debian-startup-and-set-debian-emacs-flavor.patch
 +0003-Remove-files-that-appear-to-be-incompatible-with-the.patch
 +0004-Adjust-documentation-references-for-Debian.patch
 +0005-Modify-the-output-of-version-to-indicate-Debian-modi.patch
 +0006-Look-for-NEWS-in-order-to-find-etc-rather-than-GNU.patch
 +0007-Invoke-the-correct-xmlstarlet-executable-on-Debian-s.patch
 +0008-Emacs-should-no-longer-hang-at-startup-on-kFreeBSD.patch
 +0009-Emacs-should-no-longer-hang-at-startup-on-kFreeBSD.patch
 +0010-Emacs-should-now-build-correctly-on-GNU-Hurd.patch
 +0011-Gnus-should-no-longer-use-a-predictable-temp-file-na.patch
 +0012-Security-issues-in-find-gc.el-have-been-fixed-CVE-20.patch
 +0013-Security-issues-in-tramp-have-been-fixed-CVE-2014-34.patch
 +0014-Insecure-file-handling-in-browse-url-mosaic-has-been.patch
 +0015-The-compose-key-should-now-work-better-with-UIM-1-4.patch
 +0016-The-compose-key-should-now-work-better-with-UIM-2-4.patch
 +0017-The-compose-key-should-now-work-better-with-UIM-3-4.patch
 +0018-The-compose-key-should-now-work-better-with-UIM-4-4.patch
 +0019-fill-region-as-paragraph-should-better-respect-the-f.patch
++0020-Emacs-should-now-follow-Make-4.0-directory-changes.patch